Fix: fillout missing health check timeout on health check. #4185

Colstuwjx · 2019-06-11T02:41:55Z

What this PR does / why we need it:

This PR fixes the missing flag argument HealthCheckTimeout which is removed in this commit by mistake, and keeps the default timeout settings ( 10s ) where it's NOT health check related calls.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

k8s-ci-robot · 2019-06-11T02:41:56Z

Welcome @Colstuwjx!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2019-06-11T02:41:58Z

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

k8s-ci-robot · 2019-06-11T02:42:03Z

Hi @Colstuwjx. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Colstuwjx · 2019-06-11T03:06:57Z

I signed it

Colstuwjx · 2019-06-11T03:10:32Z

/assign @aledbf

internal/nginx/main.go

aledbf · 2019-06-12T02:28:41Z

/ok-to-test

internal/nginx/main.go

codecov-io · 2019-06-12T02:34:37Z

Codecov Report

Merging #4185 into master will increase coverage by 0.27%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #4185      +/-   ##
==========================================
+ Coverage   57.46%   57.74%   +0.27%     
==========================================
  Files          87       87              
  Lines        6534     6480      -54     
==========================================
- Hits         3755     3742      -13     
+ Misses       2344     2307      -37     
+ Partials      435      431       -4

Impacted Files	Coverage Δ
internal/ingress/controller/controller.go	`46.5% <ø> (ø)`	⬆️
cmd/nginx/flags.go	`88.5% <100%> (+0.06%)`	⬆️
internal/ingress/annotations/class/main.go	`71.42% <0%> (ø)`	⬆️
cmd/nginx/main.go	`6.71% <0%> (+0.13%)`	⬆️
internal/ingress/controller/store/store.go	`61.75% <0%> (+0.49%)`	⬆️
...ternal/ingress/annotations/sessionaffinity/main.go	`55.26% <0%> (+1.6%)`	⬆️
internal/ingress/status/status.go	`73.18% <0%> (+4.73%)`	⬆️
internal/k8s/main.go	`84.21% <0%> (+23.83%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8cee8d5...b28577a. Read the comment docs.

cmd/nginx/flags.go

aledbf · 2019-06-12T02:51:14Z

internal/nginx/main.go

 	}
 	u.RegisterLocation(statusLocation, StatusSocket)

 	return &http.Client{
 		Transport: u,
 	}
 }
+
+func getOrSetUnixSocketClient() *http.Client {


Please remove this and just use buildUnixSocketClient(HealthCheckTimeout).Post(.....

why? the socketClient is gloabl variable in the previous, call buildUnixSocketClient at each request would initial one client per request, it costs memory which is valueless.

Okay, things cleared, and I will appreciate if you share with me the reason about code in this way :) @aledbf

Colstuwjx · 2019-06-12T10:59:53Z

/retest

aledbf · 2019-06-13T07:00:26Z

@Colstuwjx please squash the commits

Colstuwjx · 2019-06-13T10:40:30Z

@aledbf It seems that all things cleared, let me know if there are any issues left.

internal/nginx/main.go

aledbf · 2019-06-13T15:12:07Z

/lgtm
/approve

aledbf · 2019-06-13T15:12:15Z

@Colstuwjx thanks!

k8s-ci-robot · 2019-06-13T15:12:28Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, Colstuwjx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [aledbf]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 11, 2019

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 11, 2019

k8s-ci-robot requested review from aledbf and ElvinEfendi June 11, 2019 02:42

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 11, 2019

k8s-ci-robot assigned aledbf Jun 11, 2019

aledbf reviewed Jun 12, 2019

View reviewed changes

internal/nginx/main.go Outdated Show resolved Hide resolved

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2019

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 12, 2019

Colstuwjx commented Jun 12, 2019

View reviewed changes

internal/nginx/main.go Outdated Show resolved Hide resolved

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 12, 2019

aledbf reviewed Jun 12, 2019

View reviewed changes

cmd/nginx/flags.go Outdated Show resolved Hide resolved

aledbf reviewed Jun 12, 2019

View reviewed changes

cmd/nginx/flags.go Outdated Show resolved Hide resolved

aledbf reviewed Jun 12, 2019

View reviewed changes

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2019

Colstuwjx force-pushed the fix/missing-healthcheck-timeout branch from fd0aa62 to 18da0b3 Compare June 13, 2019 07:06

aledbf reviewed Jun 13, 2019

View reviewed changes

internal/nginx/main.go Outdated Show resolved Hide resolved

Fix: fillout missing health check timeout on health check.

b28577a

Colstuwjx force-pushed the fix/missing-healthcheck-timeout branch from 18da0b3 to b28577a Compare June 13, 2019 13:16

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 13, 2019

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 13, 2019

k8s-ci-robot merged commit ec674aa into kubernetes:master Jun 13, 2019

Colstuwjx deleted the fix/missing-healthcheck-timeout branch March 24, 2020 11:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: fillout missing health check timeout on health check. #4185

Fix: fillout missing health check timeout on health check. #4185

Colstuwjx commented Jun 11, 2019

k8s-ci-robot commented Jun 11, 2019

k8s-ci-robot commented Jun 11, 2019

k8s-ci-robot commented Jun 11, 2019

Colstuwjx commented Jun 11, 2019

Colstuwjx commented Jun 11, 2019

aledbf commented Jun 12, 2019

codecov-io commented Jun 12, 2019 •

edited

Loading

aledbf Jun 12, 2019

Colstuwjx Jun 12, 2019

Colstuwjx Jun 12, 2019

Colstuwjx commented Jun 12, 2019

aledbf commented Jun 13, 2019

Colstuwjx commented Jun 13, 2019

aledbf commented Jun 13, 2019

aledbf commented Jun 13, 2019

k8s-ci-robot commented Jun 13, 2019

Fix: fillout missing health check timeout on health check. #4185

Fix: fillout missing health check timeout on health check. #4185

Conversation

Colstuwjx commented Jun 11, 2019

k8s-ci-robot commented Jun 11, 2019

k8s-ci-robot commented Jun 11, 2019

k8s-ci-robot commented Jun 11, 2019

Colstuwjx commented Jun 11, 2019

Colstuwjx commented Jun 11, 2019

aledbf commented Jun 12, 2019

codecov-io commented Jun 12, 2019 • edited Loading

Codecov Report

aledbf Jun 12, 2019

Choose a reason for hiding this comment

Colstuwjx Jun 12, 2019

Choose a reason for hiding this comment

Colstuwjx Jun 12, 2019

Choose a reason for hiding this comment

Colstuwjx commented Jun 12, 2019

aledbf commented Jun 13, 2019

Colstuwjx commented Jun 13, 2019

aledbf commented Jun 13, 2019

aledbf commented Jun 13, 2019

k8s-ci-robot commented Jun 13, 2019

codecov-io commented Jun 12, 2019 •

edited

Loading